[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: e8905d6e -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad77c14ce124b2e577af692e19a763dcaacfa931