Merge "Fix formatting" am: ce5a77cfcd am: 22dbbbe66a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8317e21e6a96d33814d40b2e8e6e2c13e9694540