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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I221ac8d6327121805d2309234d12286dda6f9858