Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)" am: 2f1c32ef am: 3fdb0fbc am: 2fc63853 Change-Id: Ifb8410dbb81cdc55c109ef8d7b190e1d9f6bf852