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

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

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