Merge "Avoid using KeyedVector in KeyLayoutMap" into tm-dev-plus-aosp