Merge "Fix flaky test: testMobileDataPreferredUids"