Merge "Fix renaming file and moving file issue in MTP" into rvc-qpr-dev am: d099321312

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdb009f96a2e55bb29dd7189451a7cbf57d6919a