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

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

Change-Id: Ic140fcaccef94192f8ed562218d8085ca126806e