Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE