Merge "Merge "Revert "Release PREVENT_BYPASS_KEYGUARD flag"" into udc-dev am: 816387ae20 am: 439577a290"