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

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

Change-Id: Ib6124fa46557287af3075e40857d72542b346020