Merge "Inform ServiceStateTracker of airplane mode changes" am: 2b38599045 am: 0de70cba5e
am: 8610e52994

Change-Id: I7a7888601c464b005e4dba0d755bc8b8491111b7