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

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

Change-Id: I7d2873e7a89829daf5538163e05997607cefeba6