Merge "[automerger skipped] Merge "Fix a race condition in the crash reporter" into oreo-mr1-cts-dev am: 4ec8ef9b61 -s ours" into pie-cts-dev am: 9856dfa7af am: 0e45fa7cef

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

Change-Id: I9c5a36684bc27e0015445392ee3f031cbe705d78