Merge "Modify sepolicy for compos key changes" am: 5273f3a486 am: 46aba72e48

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

Change-Id: Ia820b69a2b76a857c72db3b5a2a0edd155f2a27d