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

Change-Id: I7471e41156ccbb45783a79a25f00f5123bbec6e8