Merge "Add apex name to service" am: ec73481e am: aebf8819 am: 1c6e2cbc am: bb175517

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



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