[automerger skipped] Merge "Remove Thread.sleep in Telephony unittests" into...
[automerger skipped] Merge "Remove Thread.sleep in Telephony unittests" into stage-aosp-master am: 305b2528 am: 7ba6663f
am: 223ab41e -s ours
am skip reason: change_id I11778e7e25da862dd65656f34546b24ccfe3ab34 with SHA1 8e480f22 is in history
Change-Id: Id8d76a69792d25c9d02b2624882608c6375d4ab4