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

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

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



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