Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)"
am: 2f1c32ef23

Change-Id: I1d34b1d5cb8f6b1f25269ee0238d6f4dba33ac50