Merge changes from topics "user_remove_extra_user", "wifi_net_utils"

* changes:
  UserManagerService: Add UserHandle extra to user added/removed broadcast
  wifi-service: Jar-Jar net util library
  WifiManager: Add API to query STA + AP concurrency