Merge changes from topic "cdm-apis"

* changes:
  Grant Shell CDM permissions
  Check REQUEST_COMPANION_SELF_MANAGED permission in CDM
  Fix usages of CDM APIs in NotificationManagerService(Test)
  Refresh CompanionDeviceManager's API surface
  Add explicit MAC address and display name fields