Merge "Clean up services created after running test" am: 2880afb7 am: f71d80a1 am: 88a54e3b

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



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