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

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

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