Merge "Add NPE protection to NextAlarmController dump" into sc-qpr1-dev am: 61671b413b

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

Change-Id: I316fb822dccf2fb22e21baa63e09a62abc47e80f