am 58c24412: Merge change 3422 into donut

Merge commit '58c244125fc2d2067bf89e67a154f6ca2421fe36'

* commit '58c244125fc2d2067bf89e67a154f6ca2421fe36':
  Check AirplaneMode when enabling Bluetooth has finished.