DO NOT MERGE Fix testVerifyStatsExternalConsistent case am: ffc805e106 am: 61c1261dfc

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

Change-Id: Ia9f2317b7db137cdc0800603a1319e2af19fb888