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

Change-Id: I130dc84ecfb47263679f6645a0b243f047c04e33