[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into...

[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: 0dacaf4d -s ours

am skip reason: Merged-In I81c036a8484d14683db9450b55bd379c7a728d73 with SHA-1 56f7a93793 is already in history

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

Change-Id: I86d96f38851361be3083c8a7fdf2e74dbbc35267