Merge "Fix 'Generic.kl' file has no 'ZOOM_IN' and 'ZOOM_OUT' mapping" am: 378996ed am: d2947a06

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



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