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 am: c182fff7

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



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