Merge "init_kill_services_test: clearer logs" am: bc21816d am: 3c6f1702...

Merge "init_kill_services_test: clearer logs" am: bc21816d am: 3c6f1702 am: 1d307c6f am: 6191d7f7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2490898



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