[automerger skipped] Merge "DO NOT MERGE - Empty merge to indicate...

[automerger skipped] Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06d am: 74142953 am: a2cbc7a4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic0e24c58d8ea0c18f16620dafac0a933ec8de64d