[automerger skipped] Merge "RESTRICT AUTOMERGE Remove alarms from...

[automerger skipped] Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276 am: 72b4976c am: f22a7ac4 am: 9baaf894 am: c7645ff3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I98f42f149f2379bcf9cd17ddda5528d9f2d14033