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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21b14eb7431961d28fc894d61b9a71f3a81e82d4