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

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

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