Merge changes If24cdca9,Ifcc8412e into main am: e9a8efa9d6

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

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