[automerger skipped] Merge Android 12 am: 188692e6c3 -s ours am: d596c959e6 -s ours

am skip reason: Merged-In I9114ea285729d962366230d32f254619edd5ffa5 with SHA-1 467ec3fd0c is already in history

Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.metadata/+/1847593

Change-Id: I710ffd95d17d9aa77e1f3417c819759e74ff6f36