[automerger skipped] Fix alarm throttling. am: b660bfd3 am: 36dc0ec7 -s...

[automerger skipped] Fix alarm throttling. am: b660bfd3 am: 36dc0ec7 -s ours am: 15a10db6 -s ours

am skip reason: Merged-In Id01bcf4e7d53ae7d89c99cb7f97b86163c43ea88 with SHA-1 84235dab is already in history

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



Change-Id: I0cf307b3e7c9fedd848ccd33e88ddef0cf196c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>