Merge "Fixes presubmit test flaky in dumpstate" am: 21474550bc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc260be0372fb476f571f70460a8f62da4e47a91