Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b am: 1d11f08516

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

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