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

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

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