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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bc33ba66dce185b43ad73c5e41d066117b649f1