Merge "Update TelMan API for testing Line1NumberForDisplay." am: d09bd9d9f6
am: bd95271170

Change-Id: I1ee422c3b23a59abccd65229804183b070d1d66f