Merge changes I6c321260,I85d828a1 into main am: d0abe34cca am: f7d34b9860 am: 0a948daf92

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

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