Merge "Better error message for privapp-permissions test"