Merge "Notify unlock controller when remote animation ends due to null...

Merge "Notify unlock controller when remote animation ends due to null finishedCallback." into tm-dev am: 4e1ecd1e am: 0f7b45f0 am: c88cdc85

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



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