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

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

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