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
Change-Id: I9bcb9b04ae496732cde84984796b9ec1adebf42a