Merge "Add shutdown-checkpoints to bugreport" am: 44e61624e1 am: d0964e6e0a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2321244

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