Merge "Remove android.permission.WRITE_SECURE_SETTINGS from AndroidManifest.xml"