DO NOT MERGE Return MSISDN as Line1 number if carrier config requires it.

Previously getLine1Number() returns MDN for CDMA phone, it will return MSISDN if a carrier config requires it.

Bug: 124524824
Test: atest GsmCdmaPhoneTest
      atest PhoneSubInfoControllerTest

Change-Id: I11b2e79c4a991208d6f3c914c2639e8918c4c5a9
(cherry picked from commit 1b75d80ffff871e31a69d77a865c8309ed64c6ff)
2 files changed