Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am: 992541027b
am: 58b0a7d3e9

Change-Id: Ief8d667257fec6c14f9626b69431545cb47b5575