am fa0d6120: Merge "FileSystemPermissionTest: Add /data/vpnch"

* commit 'fa0d6120be7ca67ea1e81255858ead6326dafa7d':
  FileSystemPermissionTest: Add /data/vpnch