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-qpr-dev am: 54906d06 am: eaf73705

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



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