[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L71800030001277565:N06200030020868453" into main am: b7a04919 am: dff7b7b3 -s ours

am skip reason: Merged-In I2fb9c549da19ff01e7cc3fd8bfc1f9c19aa0f0a8 with SHA-1 b7abf51c is already in history

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



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