Merge changes I0fbd41b6,If791b6d8 into main am: dcd94846 am: b68085f5 am: c9ea26e5

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



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