Merge changes from topic "presubmit-am-47892e9f11d746939b74901bbda929d2" into sc-v2-dev-plus-aosp am: 69d3e66ae3

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

Change-Id: Id904a8b745dc79e6364d8b398cb84578fcfba5ed