Merge "Add permission for MANAGE_EXTERNAL_STORAGE AppOp"