Merge "Add a delay to the removal of cached listener alarms" into udc-dev am:...

Merge "Add a delay to the removal of cached listener alarms" into udc-dev am: 50936086 am: 64f77f64

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



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