Merge "Revert "Ignore outputIsNotRedirectedToLogcatIfNotDebuggable"" into main