Merge "servicemanager: always use kernel log" am: 62f59c3dc6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2120126

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