tree c2f876e790df9f3bf1faa6a1355bd5a516649c11
parent 91a92cdafad959240b212dd0f54799b93c2cb7fb
parent fbea5f16f95e2b6c513693a01c6ff53665c59bcb
author Xin Li <delphij@google.com> 1633683607 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683607 +0000

[automerger skipped] Merge Android 12 am: 89d23e9569 -s ours am: dd22d56581 -s ours am: 0ec532beae -s ours am: c4788f486c -s ours am: fbea5f16f9 -s ours

am skip reason: Merged-In I3b3ef768bb004daf8222e4171b72b02bb76497ab with SHA-1 3d791e8869 is already in history

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

Change-Id: Iae767dea71d75a7c91be7c28af08665e78787dec