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

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

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



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