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: f274578d am: b8b48e56

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



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