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

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

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