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

am skip reason: Merged-In I4955367085f3f7c829b8b4e7b06aafaaac9ad748 with SHA-1 7131b6c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992699



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