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

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



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