Merge "Remove android.permission.PermissionManager from blacklist"