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

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

Change-Id: Icfc08862db6fccd67ccfb60dc390d456ec5387e0