Merge "AnimateKeyguardInDelay should use the animator duration scale" into sc-qpr1-dev am: 872ae9e154 am: 7011e76632

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

Change-Id: Iecbf6adc66b40883cf0f89b18792460437dc071c