Merge "Migrate packages/services/Telephony to androidx.test" am: b1fb36f9a0
am: b4b43b3f91

Change-Id: I6b775871cf3ba921c30790102ca097dfd2bea95f