Merge "Clean up PREVENT_BYPASS_KEYGUARD flag" into udc-dev am: f6bbf92b am:...

Merge "Clean up PREVENT_BYPASS_KEYGUARD flag" into udc-dev am: f6bbf92b am: f13e1af7 am: 5f75799b

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



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