Merge "Don't hide the bouncer when resetting keyguard if keyguard is already showing." into udc-dev am: e5040c84 am: 4e7f8a92

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



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