Merge "Fix confusing javadoc for WifiManager.EXTRA_RESULTS_UPDATED" into oc-dr1-dev
am: 8c4d17b4d8

Change-Id: If265583d2fbfb6fc97e2beb066a5834ca7b0c367