Merge "Avoid using KeyedVector in KeyLayoutMap" into tm-dev-plus-aosp am: b5bba63121 am: 273215cf38

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

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