Merge "Allow disabling non-system device admins" into nyc-dev