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

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

Change-Id: Idf22374a3ecda95c9570ce260b86b704acfd79d7