tree a30bac6376ccc2b2f91178e72a86c92e126efea9
parent b514d240d2a23605b0281a2b9dc169ff79af88be
parent 9352f98d371893e8a7e862b1a7a49cd770ce4474
author sqian <shuoq@google.com> 1553156937 -0700
committer android-build-merger <android-build-merger@google.com> 1553156937 -0700

Merge "Strip emergency number"
am: 9352f98d37

Change-Id: I035982738d97b973b196491ce99dc28b6d9606ac