Merge "Don't show lockscreen after using bouncer" into udc-qpr-dev am: 7b9199ce am: 63d6f371

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



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