[automerger skipped] Merge "Make a fallback tag for listener alarms" into...

[automerger skipped] Merge "Make a fallback tag for listener alarms" into tm-qpr-dev am: 7a2bfa7c am: 8df9ec6f -s ours

am skip reason: Merged-In Ifacc260a53f1d3d377dc156ce3a2404cb87684cb with SHA-1 23fa8ac9 is already in history

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



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