Merge "Fix problem of logd restarting." into main am: 5a3f2ab2 am:...

Merge "Fix problem of logd restarting." into main am: 5a3f2ab2 am: 1c18753d am: 2acb379f am: 3dfa2274

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



Change-Id: I1d29d082cd708678dbda29d2cab24d10b4a98c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>