Merge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev...
Merge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6 am: b59383a3" into nyc-mr1-dev-plus-aosp
am: 2122328c
* commit '2122328c':
Change-Id: Id942146a41e33fb549cbcaca3eb8253433357644