Rename getAndroidCarrierIdForSubscription to getSimCarrierId. Drop prefix "Android" as Android is implicit everywhere. Rename carrierName to CarrierIdName to imply correlation between these two APIs. This also helps to differentiate from another API getSimOperatorName. Bug: 71584605 Test: build Change-Id: Iba4b1c21522741b8c11836a4c39004064736b4c6