Merge "Fixing empty PendingAlarmInfo after alarm store changes" into sc-dev am: ea1b5d87 am: c3d4f9d4 am: 96b0701c

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

Change-Id: Iab12fad82d8ec695789baeb64521f1c6dcfd3598