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

Merge changes from topic "vapex_stop_service" am: e37c15e9 am: 898d8008 am: bba2acb9 am: 8837bf6f

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



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