[automerger skipped] Merge "Fix a race condition in the crash reporter" into oreo-mr1-cts-dev am: 4ec8ef9b61 am: 4d9c7d26e0 -s ours am: db81ab5189 -s ours

am skip reason: Change-Id Ie31d1f47c3485808a89c4b33addd303914cb36a4 with SHA-1 d91352f8e1 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1411051

Change-Id: I8995c2441ffd52772469d2e17c0f70e3152fb767