Change MAC mapping to use <SSID,SecurityType>

Wificonfiguration#configKey does not always return SSID + SecurityType,
which is causing the MAC for passpoint networks to be stored not
according to specs.

This CL makes sure that SSID + SecurityType is always used as the key to
store randomized MAC addresses.

Bug: 128911090
Test: unit tests
Test: Connect to "Boingo", then adb pull
/data/misc/wifi/WifiConfigStore.xml and verify storage
<string name="&quot;Passpoint Secure Google&quot;WPA_EAP">ce:98:95:f2:f7:90</string>
Test: Forget "Boingo" network, reconnect back, and verify randomized MAC
stays the same

Change-Id: I45b7d5e2b73c251526ba43dff3c69e07fa0e0b28
2 files changed