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

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

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