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

Change-Id: I454eced22c91852683cce48e031062b243d6595d