Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev