Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b

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

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