Merge "init_kill_services_test: binder logs on apexd fail" am: 642929f8 am:...

Merge "init_kill_services_test: binder logs on apexd fail" am: 642929f8 am: 0afb83f5 am: 61116c8b

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



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