am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"

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