Merge "Add carrier config keys for GBA" into sc-dev