[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent size of list changes...

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver" am: 06550c33 am: 40209c2a -s ours

am skip reason: Change-Id I5228c323bb9698864c467e9e4c400459ca404b3c with SHA-1 01b2e17c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98c52142d9c41d67aef926a1c4249d5fff954d1d