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

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



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