[automerger skipped] Merge "Merge "Add Georgian keyboard layout support" am: b61ebfd4d6 am: ce608eefc8 am: 842e588383" into rvc-d1-dev-plus-aosp am: 1ee01b6c21 -s ours

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

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

Change-Id: Id2a042844bc73f9bbd5d2d0a6ffaad3be9126a10