Merge "Merge "Update TelMan API for testing Line1NumberForDisplay." am: d09bd9d9f6 am: bd95271170" into qt-dev-plus-aosp