Merge "Revert "Revert "Release PREVENT_BYPASS_KEYGUARD flag""" into udc-dev am: 9e670f52 am: 21c47bf4

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



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