Merge changes from topic "vapex_stop_service" am: e37c15e9

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



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