Merge "Select a better phone for emergency call"
am: 3ab97c427c

Change-Id: I8a9aa0c607b33b265f8b97d7044cdfacaa844af6