Merge cherrypicks of [16615268] into rvc-platform-release. am: 5b74cfce8d

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

Change-Id: Ib82e90c661d43cf46cfb33a40ccae08c28ddca1d