Merge "Opportunistic Sub Grouping Keys in CarrierConfig" into qt-dev