Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Allow deletion of media through SAF.

Change-Id: I128fb9b17ab5f7f6bb9dad51031449f1864fa22a