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

Change-Id: Idfd42e07ad95fd87bd4cdab73a1f5de00ec3886b