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

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



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