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

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

Change-Id: I0e9f7f96cc7bc5fe3d10aed52a4ba5362e1deca8