Merge "[RESTRICT AUTOMERGE]: Fix a race condition in the crash reporter" into oreo-cts-dev