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

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

Change-Id: Idd707edfb8afc3868bb446839ea4b4d5687aeac5