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

[automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 2f922fc4 -s ours am: bb73e308 -s ours

am skip reason: subject contains skip directive

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



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