Merge "supplicant(interface): Add support for Hotspot 2.0" am: 06a3daad19
am: 21e39f87e4

Change-Id: Ie1aa347d5e9cccd20d6f0666b81f2dbdf7619bf3