[automerger skipped] Merge "BroadcastOption for "this is an alarm broadcast""...

[automerger skipped] Merge "BroadcastOption for "this is an alarm broadcast"" into tm-qpr-dev am: 3420a4e6 am: ed8716bb -s ours

am skip reason: Merged-In I70a7be35f198bcf9a3cfa232c309a381b2391e34 with SHA-1 690ad9de is already in history

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



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