Merge "Don't hide the alternate bouncer on keyguardReset" into tm-qpr-dev am: 3b62ab70

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



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