Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d am: 281fae21f8 am: eeeb10c645
am: 637c407d78  -s ours

Change-Id: Ia36702e0d637666344b2adbf813d348404b410c7