[automerger skipped] Merge "Fix NPE in ShutdownCheckPoints dumpDetails...

[automerger skipped] Merge "Fix NPE in ShutdownCheckPoints dumpDetails method." into udc-dev am: b2c2f641 am: f557eba5 -s ours

am skip reason: Merged-In I5e39f229be8d6a2e582cd8988755478766f1fa69 with SHA-1 a65f1c58 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22162902



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