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

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

Change-Id: I25e096b2cefe9fa859d00c6e53123615215c170b