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

Change-Id: I6ceeadc17bdb17b28613a07549319cd4e9c6c1f5