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

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

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



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