Merge "Merge "Don't call updateIsKeyguard from the...

Merge "Merge "Don't call updateIsKeyguard from the UnlockedScreenOffAnimationController if we can't control the screen off animation." into sc-dev am: 5f51b922 am: d52c7e3e" into sc-qpr1-dev-plus-aosp am: 6710d5c0 am: e6633105

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

Change-Id: Ibc0cb02700568c0a98f7801c6a6966a8c0942360