Merge "logcat: test: inject messages if necessary for tail test requirements"