Merge changes I0ebeca9f,I9d98c4e2 into main am: ed2534a15e am: 345175ef04

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

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