[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-50470ae8787c49ac95cec11e53c74bb2" into main am: 65467677 -s ours am: 41590429 -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: I70fb3ae91fc4a6ac14535ab1352f7eb8245d92b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>