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

Change-Id: I9b517e85f8fae84bd4ab319791ee39e56d953c68