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

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

Change-Id: I519e50935d2fae1a6483881b78f4cbb1a21e7618