Merge changes I0880685c,I865ec19d,Id3a1e34b,I31c4f4d2,I17103be4 into main am: b2348adbb8 am: e0bb26a3fc am: 9d3ad7db0c

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

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