[automerger skipped] Merge Android 14 am: cfd3a6676c -s ours

am skip reason: Merged-In I1661a43476fc852d7adbeb26db7703f743c7f08f with SHA-1 b123928699 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Mtp/+/2777042

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