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: aba0178a am: b5485855 am: 7fde723a

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



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