am 47c1cf4b: Merge "[ActivityManager] Fix ServiceRecord leakage"

* commit '47c1cf4b35616059409a0674382c2318494e877b':
  [ActivityManager] Fix ServiceRecord leakage