Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev