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

Change-Id: I8417adc402df33b30b310ea87a27e1669fb5dad6