am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" automerge: e3b07b4
automerge: a230a43

* commit 'a230a43204e3567d93a2d914123b21c14bdf495d':
  [ActivityManager] Use synchronized to protect object