[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: 0b57ef66 -s ours

am skip reason: subject contains skip directive

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



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