Merge changes from topics "crashapi2", "crashapi3" into main am: 4da69231c1

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

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