tree 273d68e9c4b13d4cd3cf7ad948b3d90c05cb0315
parent 58748edc0254027a377ed24be53c7939808df7e2
parent f22a7ac46328f99ca0b7c501c868238604f6b581
author Treehugger Robot <treehugger-gerrit@google.com> 1599796488 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796488 +0000

Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276a9 am: 72b4976c66 am: f22a7ac463

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

Change-Id: I38d57b0ceaaf63fec5ca3cb5ff4b21997912016d