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

Merge "Merge "Remove zoom from wake-up transition" into sc-dev am: e7041811 am: 9471396c" into sc-v2-dev-plus-aosp am: 753921ce

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

Change-Id: I35e0f452789ff5ab9d85e8fdea446bd34ea9f87c