Merge "Revert "Support KeyEvent.KEYCODE_ENTER on the keyguard"" into udc-qpr-dev am: 7264493a5d am: b1f5ba079b

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

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