Merge changes I0e61db91,Icb7ab995 into main am: 0d60b07574 am: 73a91e9274

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

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