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

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



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