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: bf397b7c
Change-Id: Ief80d30e1773d72128b8f49519035b5381e08363