Merge "Restorecon new vndservice_contexts file." into oc-dev am: 6c2b3e5fd8
am: c04403fb6e

Change-Id: Ia523a82884a8871ecc74644f81e1ddc98bdbc833