tree be97d78e594e5990763839df11b6742102133cc0
parent d9a967d9cc187bd6a7a2b6c5e6db91d2e61c5108
parent b4b43b3f918b334bf1a7989adb6de54aa7e5ae50
author KOUSHIK PANUGANTI <kpanuganti@google.com> 1553719417 -0700
committer android-build-merger <android-build-merger@google.com> 1553719417 -0700

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

Change-Id: I6b775871cf3ba921c30790102ca097dfd2bea95f