[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2ce41c8f4d -s ours am: 1564ac5348 -s ours

am skip reason: Merged-In I3acad682b4cf6c6ad9bcb2ce91d845b21a9f133a with SHA-1 a04310d7b5 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/2990855

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