Merge "Remove manage_device_admins and manage_profile_and_device_owner permissions." into nyc-dev
am: a1f05d3

* commit 'a1f05d318e26b4e4d9d3836b59b4501dd785bbb0':
  Remove manage_device_admins and manage_profile_and_device_owner permissions.