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

Change-Id: I3dc4572e3b3d2c80a446d78fb0785f8f63bf2391