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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcc2345b7433ec2eb823c1837179f53b476208e7