Merge "/vendor/priv-app is added to the permitted paths for the default ns" am: 5dde5e38d2
am: 3c28804815

Change-Id: I961c2f038b714d5f51bbc995174217ef67e10b8c