Merge "Split composd's service in two" am: 6d485dfd89 am: c995fd7ac3 am: 3ecbd02bf9 am: f619dc9cc5

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1897594

Change-Id: Icf41c3fcea975ef45106d6c00801d745cdb72460