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 am: 25425c27
Change-Id: I3bca1a279c7350eb9f8b04676501ed7eb46cc963