Merge "Revert "Remove nomedia logs from persistent logging"" into tm-mainline-prod