[automerger skipped] Merge "DO NOT MERGE Fix testVerifyStatsExternalConsistent case" am: dd99c310 am: 2d6ebd25 am: 08cc4f70 am: fa894b3f am: c959c6a4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5f5a9cb67419e459b5e244b0390274aacbb5e5fe