[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 skip reason: Merged-In I2e5d88ea3e008d55596702e3d324c919bb3c20cf with SHA-1 ba6833da is already in history

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



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