[automerger skipped] Merge Android U (ab/10368041) am: d446207293 -s ours am: 4b21a3314b -s ours am: 31557212c1 -s ours am: 1168732877 -s ours

am skip reason: Merged-In I611d7f821113f23f65903fd01bdd4148bb330920 with SHA-1 218cb26cad is already in history

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

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