Merge changes I2b4d2763,Ieeb40d03 into main am: 42ebed4a2f

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

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