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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09506c195dbaed3cba25ce10d6bc3dd74732e1b7