Merge \\\"Revert \\\"Parse \\\"vendor/priv-app\\\" to find privileged applications\\\"\\\" into nyc-dev am: c211539769 am: 4504b0e40c
am: af1d49a4c8

Change-Id: I463c1cb75884d2e8bbcd08c971dcd3fcd2ad3eea