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 am: 074e2397

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



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