am 2047929e: Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev

* commit '2047929ef7c4484e81215b9146f9e435d4d33025':
  Changed config_wifi_hotspot2_enabled to false.