HalDeviceManager: Use name + type for interface cache

IWifiNanIface & IWifiStaIface uses the same interface name. So, using
just the interface name to key into the interface cache leads to the
wrong interface being deleted from the internal cache.

Bug: 70811488
Test: Modified Unit tests to reflect the interfae naming scheme used
on Pixel devices (i.e sta0 = wlan0, nan0 = wlan0, ap0 = wlan0, sta1 =
wlan1).
Change-Id: Idb6a46146a710f2ea79109c213c47c4b13b1e03b
2 files changed