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: 8d975c6d am: 049e7cd7

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



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