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: d0931a56

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



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