[automerger skipped] Merge "Avoid using KeyedVector in KeyLayoutMap" am: 2fd11cca9c am: 01531617fd -s ours

am skip reason: Merged-In Ia1f41d17d7ee912534edffe1a1e7655866fa54c6 with SHA-1 53f0a5e01c is already in history

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

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