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

[automerger skipped] Merge "Add Georgian keyboard layout support" am: b61ebfd4 am: ce608eef am: 842e5883 am: 379702db am: 69671b27 -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: If2ba5368739348c059accc6c9c4b7c1fb25ecb56