resolve merge conflicts of 155f20a6 to...

resolve merge conflicts of 155f20a6 to android12-tests-dev am: 559df942 am: a7ce9003 am: 45263c60 am: 2edd0e9d

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



Change-Id: Ib315b4a57f99f998c4f0801efba5d52d45703216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>