Merge "Merge TQ1A.230205.002" am: 1d2c037e87 am: 4d50edd25b am: b66ac34a65

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

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