Merge changes I0fbd41b6,If791b6d8 into main am: dcd94846 am: 1d11f085 am: 6bea09c1

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



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