[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: 023a4e70 am: cb45ba76 am: b0e810b5 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15930770

Change-Id: Iec34c46b34d55ef202e79d2ca3a1405ca13a61f4