tree 45bf7067334a6d9d28c4517f8f84e3734083ddbd
parent 797e61a6a597efc41abd1ad9621b7666e95fbdce
parent cb04f43c9c350090b5ef78ad7b101fa2e4a64188
author Betty Chang <changbetty@google.com> 1576120020 -0800
committer android-build-merger <android-build-merger@google.com> 1576120020 -0800

Merge "[Telephony Mainline] Use new method for mainline"
am: cb04f43c9c

Change-Id: I7a0978215ec42fb94b7e50b25c603949a22f90f7