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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58f6d3ceef56fd52edee223f6371c13468e23caa