Merge "logd: record and replay log messages" am: 7a6191ce2e am: f5962b1bb5

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

Change-Id: I24b19b30b44f4f8cbd539af67a88120389f87ccb