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

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



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