Merge "Merge \\"QS: Don\\'t disable hotspot animation when leaving airplane mode\\" into nyc-dev am: 8c9b6609f1 am: c926969dad" into nyc-mr1-dev-plus-aosp