[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 6785487669 -s ours am: 4b642d4194 -s ours

am skip reason: Merged-In Idcf85b400cb178b1093717dcd9ffa80758462d79 with SHA-1 53cf44bcf9 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redbull/+/2576979

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