Merge "Revert "Release PREVENT_BYPASS_KEYGUARD flag"" into udc-dev