Merge "Fix media being stretched during the wake-up/unlock animation" into...

Merge "Fix media being stretched during the wake-up/unlock animation" into udc-dev am: e8fa3364 am: c227332e am: 25b83f75 am: cc0e8c24

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



Change-Id: I9b5c1bd39b89be9a0496cb1f1be28916a97a1c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>