Merge "Revert "Refactor KeyEvent constructors."" into udc-dev am: cf6e3e7f am: 359c3e87

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



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