Merge "Fix flake in testMobileDataAlwaysOn"