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: b33c0181" into rvc-d1-dev-plus-aosp am: f0f2336e am: 44e27ce1

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

Change-Id: Ic8fd7dee4bc094fa2294962798ff140829e98e9d