Merge "Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177c am:...

Merge "Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177c am: f821a8a8 am: 589fef0c" into rvc-qpr-dev-plus-aosp am: 8a9da508

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

Change-Id: I5ae9790309e9f8505dc20e58a183deb9c4f74080