Merge "Avoid likely deadlock in the calltree under alarm manager" into udc-dev...

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

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



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