Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev am: 781c8cb65e
am: 1ddaa67a59

Change-Id: Ice1a513a00e4b8962b11db6091f0bfe9e0f279f1