Merge changes from topic "ag-wire" into main am: 0a44da8589 am: dfa3f73729

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

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