am 99d2ffa1: Merge "Split Activity Transitions out of PhoneWindow."

* commit '99d2ffa1268da1258390fa6f272bf41687084d7b':
  Split Activity Transitions out of PhoneWindow.