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

Change-Id: I09fcfa6eefff3c500abc743918d8c625bb92cf71