Merge "WifiManager: Add missing field to getConfiguredNetworks() doc" am: 846c0fe038
am: c30beb79e7

Change-Id: I318718984f1c3d90b5f39d1adc2986fcba9265b2