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