Merge changes from topic "am-3b28810eb2844ec6a5fe91fd42c8bc47" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Allow shell to control transition animations" into udc-dev am: dca0a91a -s ours am: 5be086b1 -s ours
  [automerger skipped] Allow shell to control transition animations am: 8bddf509 -s ours am: f143b5a7 -s ours