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

Change-Id: I6b3146f6f082732967af0375ab745e8cd11bc71e