Merge "vndservicemanager: use separate SELinux class." into oc-dev