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

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

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



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