Merge "Avoid wrapping the display change leash to Keyguard unlock animation"...

Merge "Avoid wrapping the display change leash to Keyguard unlock animation" into udc-dev am: 9f41a7a2 am: ba5d522a am: 2cf3c7ff

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



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