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

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



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