Merge \"WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 am: eef477c8b9 am: cf3595400b  -s ours am: d77404a0e5 am: 15058ed5e2\" into nyc-mr1-dev-plus-aosp
am: 3950675286

Change-Id: I6219e1518ed113628e71062d6eb4e496d73c4e42