Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE