Merge "Restrict access_mtp permission access to Android/"