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

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

Change-Id: I2b993a15c4696dfef2e7b606ed4b302520dac384