Merge "Avoid likely deadlock in the calltree under alarm manager" into udc-dev am: 73f41157

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



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