Merge "Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev am: 46b2968ff9" into oc-mr1-dev-plus-aosp