[automerger skipped] Merge "Remove Thread.sleep in Telephony unittests" into...
[automerger skipped] Merge "Remove Thread.sleep in Telephony unittests" into stage-aosp-master am: 5cab9411 am: ae4b6a8b
am: 46f7ae69 -s ours
am skip reason: change_id Ib3890f0b02695d056c6466573b8b731f76490683 with SHA1 2ab8235b is in history
Change-Id: I9292ee7cda59176ca858d89e221b1e5205121277