Merge changes I08f5aa3e,I7876e44c,I4e90a045 into main am: 0959d41bff am: c8d75a80e3

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

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