Merge "logd: add locks around ~SerializedFlushToState" am: 1bacb2c389

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449535

Change-Id: I54186d82ba2603a8076ff6714a8f2f59a330643a