[automerger skipped] DO NOT MERGE - Merge Android 13 am: 0381da6fe6 -s ours am: 3f6082fd10 -s ours am: 6f3a677a17 -s ours

am skip reason: Merged-In I278a58f24712b21522e6a14a2a6a3979406b40e9 with SHA-1 a36f08b4c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/2186742

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