Merge "Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661 am: 2dda9f5d66" into oc-dev-plus-aosp
am: a7cba48907

Change-Id: Id27920b3012adde075cfc270b14b5378037913c0