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

Change-Id: Iccac8bab23f6f2ad081d2661e68dc5b81cbb294f