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 am: d8b14440

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



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