Merge "Update CompanionDeviceManager javadoc to include the...
Merge "Update CompanionDeviceManager javadoc to include the COMPANION_APPROVE_WIFI_CONNECTIONS_PERMISSION" into rvc-dev am: a9fbd8e4 am: 61d8653c am: 37a43fca am: c639f2fa
Change-Id: If3aa10e05f40618307e91d4bc7e5a1105a8714e9