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

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

Change-Id: Id19160801137a718d337050e9ab4a219008dc90b