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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a5be59a2e8620005a0892a0f24d25c073af341d