Merge changes from topic "vapex_stop_service" am: e37c15e9 am: 898d8008

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



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