Merge changes from topic "cherrypicker-L17700000962261813:N11400001392188571" into main am: b93626c412

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

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