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

Merge "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" am: e7e9fb98 am: c1dec584

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



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