Merge changes from topics "crashapi2", "crashapi3" into main am: acafa40d82 am: 1a7a68461f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2962950

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