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 am: d2c998a0 am: 18b5cc5b

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



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