am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE

* commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
  Fix FeatureUser leak in ConnectivityService