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: 5a959a3f

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



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