[automerger skipped] Merge "Avoid using KeyedVector in KeyLayoutMap" am:...

[automerger skipped] Merge "Avoid using KeyedVector in KeyLayoutMap" am: 2fd11cca am: 01531617 -s ours am: 3dee0df7 -s ours am: a365de7a -s ours

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

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



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