Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING"