Merge "Make sure data is enabled on the non-primary sub's voice call only if...
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 am: d1963130
am: 354ebbcc
Change-Id: I63f8077c9b6a7cb3ed13e36e684559b0fccc86cd