am f6d03f39: am 799cb730: Merge "[ActivityManager] Fix race condition in pss...
am f6d03f39: am 799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
* commit 'f6d03f39':
[ActivityManager] Fix race condition in pss collection