Merge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev am: 5e6abb3f0a
am: 2e30c8e03d

Change-Id: Iaaf5dd70a213220bc23dacdb287ee75be5b9329c