Merge "Revert "Release PREVENT_BYPASS_KEYGUARD flag"" into udc-dev am: 816387ae am: 439577a2

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



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