[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-f169e270df0643178ec8b2b1b4ebb154" into main am: c009c12f -s ours am: 8f96ee37 -s ours

am skip reason: Merged-In I7d3f8fe399cb4e83f5f5fb80e27d232dad3b5b74 with SHA-1 ffbe20e7 is already in history

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



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