Merge "Fix 'Generic.kl' file has no 'KEYCODE_FOCUS' mapping" am: 826b805842 am: 602bff590b

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

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