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: 5adc888f
Change-Id: Ic50cf243648f483056d832dfd843d557d7ec9e05