Merge "Merge "Avoid alarm lock when calling outside" into tm-dev am: 48d602a8a6 am: 9ce4b25e7d" into tm-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
9f21d4f1cf