Merge "Add conditional=true for @RequiresPermission"