Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev am: a96e906e80
am: bcd1637096

Change-Id: I36cd761b696035181fb12d285762f74fbaaec4b4