Merge "init_kill_services_test: special case apexd" am: 89a4db46

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



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