[automerger skipped] Merge "Make aosp-main _mostly_ in sync with goog/main"...

[automerger skipped] Merge "Make aosp-main _mostly_ in sync with goog/main" into main am: 34aa8a61 -s ours am: 8663c4cb -s ours

am skip reason: Merged-In Ie9c5deb25ec5f8594feac15b2a3f41b40a65e4f0 with SHA-1 1d74c21f is already in history

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



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