Merge "Fix KeyCharacterMap overlays by reloading base overlay before applying another overlay." into sc-v2-dev am: 6f28d23f07

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

Change-Id: I77c772f65602f64e71d791dcfa3ea13ec98ff0b3