am 80ae2850: Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c automerge: 80a28fe

* commit '80ae285010f0113c663ba06e66108472c57f5883':
  Fix janky in transition doze -> lockscreen