[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: ec3c3413 -s ours am: d6b3b13f -s ours am: b933c2a1 -s ours

am skip reason: subject contains skip directive

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



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