Merge "Merge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev am: 8d0ba598cf" into oc-dev-plus-aosp
am: e0375adaaf

Change-Id: I675107ab7e7cb5a497e56ca10307aed50e6df735