[automerger skipped] RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver am: 5504a25a6f am: 218670e095 -s ours
am skip reason: Change-Id I5228c323bb9698864c467e9e4c400459ca404b3c with SHA-1 01b2e17cbd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471525
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9037163b235f27d96a7cf5f962cd0046092dc8b5
This commit is contained in: