Merge "Don't reset the keyguard if it's going away." into sc-v2-dev am: 8b988e72 am: 5cbd4f75

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

Change-Id: Ibfbe90beca385dcef9ed5c9ed865edbafd1b1657