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

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



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