Merge "Revert "Remove zoom from wake-up transition"" into sc-dev am:...

Merge "Revert "Remove zoom from wake-up transition"" into sc-dev am: c19b6957 am: a7431996 am: 29ebc739

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340831

Change-Id: I537256f1714076be32c69a1073e2f97c61643e3f