[automerger skipped] DO NOT MERGE Fix testVerifyStatsExternalConsistent case am: ffc805e1 am: 61c1261d am: 8ab5cb31 am: f3247635 am: 4ef8b501 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I95d65a2d39058a152979328acc2aa01b644656a7