Merge "Add testMobileDataPreferredUids back to presubmut" into main