am 30813942: Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev

* commit '308139425e697536304be55a5865aae7a290fb1d':
  Disable WiFi autojoin when user decides via "Stay connected?" dialog