Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev