Merge "Remove @hide for CarrierConfigManager constants"
am: f1de6ef70b

Change-Id: I5f504a9d0a4acaa883e9deacb6d8afaf09f96a29