[automerger skipped] Merge Android 14 QPR1 am: 0afb677cfc -s ours

am skip reason: Merged-In I93f5517088b4d09d9e241b2d3b4e9c4d26a24934 with SHA-1 fb14bb624a is already in history

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863160

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