Merge "Merge "Use fadeoutDuration in keyguard fadeout" into tm-d1-dev am:...

Merge "Merge "Use fadeoutDuration in keyguard fadeout" into tm-d1-dev am: 4f615e81 am: 1ec2b5ea" into tm-qpr-dev-plus-aosp am: 83f637fa

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



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