Merge "SystemUI: Do not turn on Wifi hotspot in APM Mode"