Merge changes I9115b707,I1912b8ad into main am: 4453934e28

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

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