[automerger skipped] Fix problem of logd restarting. am: 9f007535 -s ours am: e639c253 -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: I49a85b8b79a4de38444c70c962b17680bec4a6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>