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 am: d31f435f" into sc-v2-dev-plus-aosp am: 5c545415

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

Change-Id: I601a8094454192c7ecefb61399cd401ee02ae161