[automerger skipped] Merge "Add key character maps to layoutlib dist files"...

[automerger skipped] Merge "Add key character maps to layoutlib dist files" into main am: b3731e0d am: 7ee41516 -s ours

am skip reason: Merged-In I147159912f85daafc97364468d6a6c2cfa3916b8 with SHA-1 ea9dab47 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2802643



Change-Id: If759cd626082bb7078801a163740433cd82a7780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>