Merge "Fixing empty PendingAlarmInfo after alarm store changes" into sc-dev am: ea1b5d87 am: e1b717d7 am: e224a243

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

Change-Id: I225e087314dee022819f3070e1ffedaff022ef9f