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

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

Change-Id: If635709fda4e75ff0178d38f9ab61e4b36a7a75c