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

Change-Id: Ibc13b26fc01700c318f8d82bac0fbeae8183dae3