Merge "Make sure data is enabled on the non-primary sub's voice call only if the primary's data is on" into qt-r1-dev