Merge "Fix Keyguard exit remote animation not invoke finish callback" into...

Merge "Fix Keyguard exit remote animation not invoke finish callback" into sc-v2-dev am: 56e45a0d am: d266638c

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

Change-Id: Id91f2bbb7747b9148982a7be153b7856c06c30dd