Merge changes I3446249f,I4ec5133f,If2494dc9,I1d7c0651,Ie8d824e5 into main am: 3d65588f18

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3206193

Change-Id: I0a475773dce811986f81a77c08be623fb3fed5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>