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

Change-Id: I2de89dbbb3e174bc23c41067f7bc54be11a3029d