[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: f4f7ffcf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic5ada7fe17e7bd564ccd3b77c9fbac382b8af855