Merge "Implement code for getting contact-default phone acct" am: eb496c3adb am: 0a573e00d3
am: 864834e5cb

Change-Id: I78493e6a8babbb0dec9bef9f8be72f77364ee5e0