Merge changes I2b4d2763,Ieeb40d03 into main am: 42ebed4a2f am: 148ddb9fd9

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

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