am 20b8dd3a: am 50dc3bca: Refactor ActivityManagerService activity stack.

Merge commit '20b8dd3a05ab9f7701631ebc9f81038f31949a9f'

* commit '20b8dd3a05ab9f7701631ebc9f81038f31949a9f':
  Refactor ActivityManagerService activity stack.