Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev