[automerger skipped] Merge "Migrate packages/services/Telephony to androidx.test" am: b1fb36f9a0 am: b4b43b3f91
am: c07d394346 -s ours
am skip reason: change_id Icff5cdcee2284515071e8694bae7db82749071fd with SHA1 e258ceacd2 is in history

Change-Id: I96070d829d6c75ddf6f92a9ca0f006eb9011e705