Merge changes I4fe79461,I3a1a51c4,I4aee0cab into main am: f362f1092a am: 2c46bc438b

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

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