[automerger skipped] Merge "WifiNetworkSuggestionsManager: Persist enterprise credentials" into qt-dev
am: d2aff57d02 -s ours
am skip reason: change_id Ife2cff3daf84a5986cb2b63207eccf1b6faee5ae with SHA1 df6df476c9 is in history

Change-Id: I307b641638d2f922574ddfafc324519aaa2a3824