Merge changes Iccc47e83,I163cb274 into main am: 17a51311ef am: 6d1717b81a

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

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