Merge "Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c112" into android11-tests-dev