[automerger skipped] Merge "Fix problem of logd restarting." into udc-qpr-dev...

[automerger skipped] Merge "Fix problem of logd restarting." into udc-qpr-dev am: d7ab422d -s ours am: 0a7b2261 -s ours

am skip reason: Merged-In I375ee9a2df50b445e21ef847614644ffa2af1f36 with SHA-1 039aa7bf is already in history

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



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