am 240602f4: am 877d8939: am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"

* commit '240602f43184b820ecff064d61e99017f849c0cf':
  [ActivityManager] Fix race condition in pss collection