Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver" am: 06550c33ba

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id40b4bedeb892aee3cc1c19037e8924125725a3b