Merge "Allow INVALID_SUB_ID to get Default Phone"
am: 57edcd8221

Change-Id: I44638240da27d506b4f997c0a16294453df78d06