Merge "Avoid using KeyedVector in KeyLayoutMap" am: 2fd11cca9c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126146

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