[automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2 am: 0d5ffa548a am: e7f27bb145 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ide7ab73428383461053f65e59c22e049b012321f