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

Change-Id: I044ef75eace6125620c1781e1eec1d80b247a66b