Merge "SELinux issues:" am: c9ab4a420c am: 33f0d49ae4

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

Change-Id: Iae3d10cb46831fc3c41f1dceed50d93f5e958422