Merge changes from topic "am-50470ae8787c49ac95cec11e53c74bb2" into main am: 65467677 -s ours

am skip reason: Merged-In Icfb71eb0431a5fa6db9eeed5dfbf17a4d0208226 with SHA-1 ad74fd7c is already in history

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



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