[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: 09cc64c0 am: 75147125 am: 4cd119dc -s ours am: 9143ef77 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15930724

Change-Id: Idca9b227e1a6790ae0d9a43bc9e866d50d526e14