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 am: 11e3d04a
Change-Id: I82a83bda0e211fb63c5cdf98becac97bd8bdbe81