[automerger skipped] Merge Android 14 QPR3 to AOSP main am: cfc57140e2 -s ours am: 19e037da27 -s ours

am skip reason: Merged-In Ida669a9c87420892626a477270b264d6c594542f with SHA-1 3b63f285b3 is already in history

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

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