Merge changes from topic "presubmit-am-30a67e71cf3f4356b9a5591edad96f73"
* changes:
[automerge] Make CompanionDeviceManager.apk to platform signed 2p: 954c43458b
Make CompanionDeviceManager.apk to platform signed
This commit is contained in: