Merge "Fix confusing javadoc for WifiManager.EXTRA_RESULTS_UPDATED" into oc-dr1-dev