tree 7c298ed344a3e27c0056dabd4ce820dba8962499
parent 8d65b4ff6a6913a32001026c003a34b83e45fdef
parent c07d3943461552b72c992779dad4acd2ea5440aa
author KOUSHIK PANUGANTI <kpanuganti@google.com> 1553719667 -0700
committer android-build-merger <android-build-merger@google.com> 1553719667 -0700

[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