Merge changes I0ebeca9f,I9d98c4e2 into main am: ed2534a15e

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

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