DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 09cc64c061 am: 751471257b

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

Change-Id: I4bf4b5269e42cf071381afff09fe7ab017262540