Merge changes from topic 'am-a57c7c884e184332ab6ba25437abb1a5'

* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 am: 134706940b am: 03e4bc1ead
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d am: 31b8e658d3 am: 996986254f