Merge changes I5275e9ce,I2fb9b10b am: ac94a46634

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

Change-Id: Id2cecbdfa432b8cb2537fa7f1ad19a6ec60e32ef