Merge "Remove dumpstate error race condition" am: 5c67510b4f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice28160099c9b46baeff8cac76137e6b81b76a67