[automerger skipped] Merge Android 13 QPR2 am: 545f0a01f3 -s ours

am skip reason: Merged-In Ia6cc03438031fa81233702322b6c0bcba5b02de1 with SHA-1 5e03373357 is already in history

Original change: https://android-review.googlesource.com/c/device/google/atv/+/2486780

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