Merge "Handle race conditions in SCS when statsd dies" into rvc-dev am: 76994e73a7 am: a4f798d902

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

Change-Id: I83ee8169d44b25670b0bde91d638f1954b268336