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

Change-Id: Idf096efcf9e5301e006cd144f3c31d7c5b5d670d