Merge changes from topic "presubmit-am-7a77b5bffdb04bf38bcec9ec17d4d6ee" into tm-qpr-dev-plus-aosp

* changes:
  [automerge] Revert "Fix bug where taskbar is translated during hotseat handoff." 2p: fa8cc97e5f
  Revert "Fix bug where taskbar is translated during hotseat handoff."