[automerger skipped] Merge "Migrate packages/providers/TelephonyProvider to androidx.test" am: ac0832ae5c -s ours am: 3c9171970a -s ours am: 92a344ef92 -s ours
am: 5ad6aa25ff -s ours
am skip reason: change_id If33f3423c4f47fab3ce2b7d800aa463491434892 with SHA1 4340ae8b18 is in history

Change-Id: Iea7dfb594f7832d83800015d820c9e005f05edf0