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 am: b8cc6137
Change-Id: I73eba3bf42240e9d0b88e627970b03348ece13b1