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

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

Change-Id: I19444593cd316dcfb611c38b2ba6f510ba9ccfb9