Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)"