Merge "Address leftover comments on aosp/1212191" am: 962fcbfb73

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b5f86f592dfa093b56e00c0445695cd42a4a963