Merge "Don't reset mPendingPinLock on keyguardGoingAway" into udc-dev am: 0c820c1e86

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

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