Merge changes from topic "OMAPI_VNTF" am: b25774f53c am: 55cd3d5260 am: 9c4918ca8d am: 256bb6d01c

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

Change-Id: I87e2bfe890a79171ef7ca57a50fbe39a87d695e3