Merge changes I9dc35703,I7c4aea4e into main am: f18fab0539 am: fd41d43ad8

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

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