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

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

Change-Id: Ib7506e7d4f86d150cbabe44e27de6b98e1737984