Merge "Add apex name to service" am: ec73481e

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



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