[automerger skipped] DO NOT MERGE - Merge Android 13 am: 29a38e870a -s ours

am skip reason: Merged-In Ied88020a93018b85bc052641eec9f45e45d6a5d2 with SHA-1 dc88dd220f is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/abi-dumps/ndk/+/2186562

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