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

[automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: 03baf201 -s ours am: ab930fed -s ours

am skip reason: subject contains skip directive

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



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