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

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

Change-Id: I510e19a04d80f828010ede4dd0865ed9d0641430