Merge "Remove Thread.sleep in Telephony unittests"