Merge "Merge "Merge "Merge "Fix testVerifyStatsExternalConsistent case" into...

Merge "Merge "Merge "Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c1" into android11-tests-dev am: 6f05e37e" into android12-tests-dev am: ea0da8ad" into android12L-tests-dev am: 3e8d5f75

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1179609



Change-Id: I1c1539d3d093f4e0b6db73fbcee75267c75755f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>