Merge "Ignore testReevaluateNetwork until Q" am: 8c9b98c18e

Change-Id: I0c8c1ecba97100efc49c2ec776af83a60160bd44