[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: a1fe8d75 -s ours am: 610ad795 -s ours

am skip reason: Merged-In I8b23ec92656b37cb81bb74bfa6b70e6685b024a3 with SHA-1 2d5597da is already in history

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



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