DO NOT MERGE Fix testVerifyStatsExternalConsistent case am: ffc805e106

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

Change-Id: Id7d9ae6d0c776a3d69472ec00945210f7bbefd50