Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING"
am: ac9e1f5580

Change-Id: I6f1827d5387a1b04c0f1a3dd22301ef1758f5e72