Merge "Update android_manifest.xml to reflect the new permission level." into sc-dev