Merge "Revert "Request MANAGE_EXTERNAL_STORAGE permission"" am: e21d0ea642 am: 4ec80cc67d

Change-Id: I01f123c30677d6208e08d700e8e98c7bb8e4df16