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

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

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