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

* commit '1d065987ebe5a3ac9480f7871b6fb69fca98ef85':
  [ActivityManager] Fix ServiceRecord leakage