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

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

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



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