[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: 58175ace -s ours am: ae8a1b7b -s ours am: 5a499ad8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I407fea0672f9aece7007bbe6a8dd0ebd51d07717