Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev