Merge changes I9dc35703,I7c4aea4e into main am: f18fab0539

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

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