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

Change-Id: I4def7868cfea25117552cd551ea7d4bd462bde2f