Merge "Revert "Use getPhoneNumber API to get phone number on T"" into tm-dev