[automerger skipped] Merge "Fix ExternalStorageProvider always throw exception when rename" am: 8883851c71 am: deb51d8489
am: 5017286aa1  -s ours

Change-Id: I92c692f9f157041a4bba0603895b999a7cb15e8f