Merge "Revert "Support KeyEvent.KEYCODE_ENTER on the keyguard"" into main