Merge "Remove rename/delete for external storage." am: a4419eb57a am: d8eb94c8df

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1984351

Change-Id: Ieb346c9695d3a24f3fe58df857ce2f6358992a95