Merge "[DO NOT MERGE] resolve merge conflicts of a57cde11c43cb88048abe6e4b2c202eaec2daadd to rvc-d1-dev-plus-aosp" into rvc-d1-dev-plus-aosp am: a8518be0b5

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

Change-Id: If645370f0064b062ec78ed46ce447cd3162f345c