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 am: 2c916b35

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



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