Merge "Prevent bouncer from showing during unlock animation" into udc-dev am: 557775c4

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



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