Merge "Add a default SSID prefix for local only hotspot"
am: e98a2942a4

Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2