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

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

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