Merge "Merge "Avoid alarm lock when calling outside" into tm-dev am: 48d602a8a6 am: 9ce4b25e7d" into tm-d1-dev-plus-aosp am: 9f21d4f1cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17972621 Change-Id: Ie85d5ed14d9f7256729ee23b1871b4f4e3c1d408 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: