[automerger skipped] Merge "Fix renaming file and moving file issue in MTP"...

[automerger skipped] Merge "Fix renaming file and moving file issue in MTP" into rvc-qpr-dev am: d0993213 am: da4cb98b -s ours

am skip reason: Change-Id Ia37be7a027bfe502e3f7c96babe5a5bbed5f942c with SHA-1 20079f10 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13090503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e91e72ad6154cedd9f826ef6929260c75a386a9