[automerger skipped] Merge "Remove Thread.sleep in Telephony unittests" into...
[automerger skipped] Merge "Remove Thread.sleep in Telephony unittests" into stage-aosp-master am: bd676f24 am: 5fc7a64b
am: f793a8f8 -s ours
am skip reason: change_id I33309a4d253a48bc3904fb7b980ea068b4e83177 with SHA1 c21dd6b7 is in history
Change-Id: I016c63bae3c98cdadd27a4731ade86023536b680