[automerger skipped] Merge "Avoid using KeyedVector in KeyLayoutMap" into tm-dev-plus-aosp am: b5bba63121 am: 273215cf38 am: cd7d27d49d -s ours

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

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

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