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

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

Change-Id: I1480600ee2e18a6ab06c833916206f80573d8211