Merge "DO NOT MERGE Fix testVerifyStatsExternalConsistent case" am: dd99c310c0

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

Change-Id: Icbe18a9fedc59f437444d65c2cfbfb8e5bbd8210