resolve merge conflicts of 155f20a6 to...

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

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



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