Merge "Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177cec am: b33c0181ec" into rvc-d1-dev-plus-aosp am: f0f2336e86

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

Change-Id: I0c7f90471d5ade176f38a2b7f959a962a3c2cdba