[automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main am: 0653799262 -s ours am: cc1558f2cd -s ours

am skip reason: Merged-In I5dffb12ede60ec4fe40dbeefdf5f6403c0fb3a49 with SHA-1 502234b572 is already in history

Original change: https://android-review.googlesource.com/c/platform/developers/build/+/3132193

Change-Id: I8b8b401d6480714472678a307984c410f34f9c49
Signed-off-by: Automerger Merge Worker <[email protected]>