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

Change-Id: Ief7fe2af1bc4bbf6b6028d5a801c1929c5f7a3a6