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

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