tree 2550e391dd1e88ce07a69895cced3cbf9f0a2368
parent bd271857f8cfe8dd7a360fd1c6aa170f795c09f2
parent 5c266a3b2f782a90e5f55d89fe58b679563e80b1
author Shuo Qian <shuoq@google.com> 1547751095 -0800
committer android-build-merger <android-build-merger@google.com> 1547751095 -0800

[automerger skipped] Merge "Get the Phone to use for an emergency call of the emergency number address" am: 509ffb2259 am: b7c26f73d3
am: 5c266a3b2f -s ours
am skip reason: change_id I43787876ea999a005622deec6da7d6dece876f06 with SHA1 b5d4a0b765 is in history

Change-Id: I40c6818ff720e4c92dc100658bfa2d643a16c098