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

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



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