Merge "Revert "Add capturing bugreport on failure for permission tests""