Merge "Make a fallback tag for listener alarms" into tm-qpr-dev am: 7a2bfa7c

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



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