[automerger skipped] Merge "Merge "Add Georgian keyboard layout support" am:...

[automerger skipped] Merge "Merge "Add Georgian keyboard layout support" am: b61ebfd4 am: ce608eef am: 842e5883" into rvc-d1-dev-plus-aosp am: 1ee01b6c -s ours am: 5e1d498f -s ours

am skip reason: Change-Id I9e0ff70fea1e3b4301b310d42a053da30c767508 with SHA-1 b424530e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417621

Change-Id: Id911c32ce59f158d2b056215b06815290cc7d682