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

Change-Id: I9678fbec65ac5f637ea302cf78f9b54afb7603f2