[automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is...

[automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779 am: 0d5ffa54 am: e7f27bb1 -s ours am: e8000b18 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4368407645cc363f50012e5e78225ef790f4f5b7