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: 6a624f12

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



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