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

Change-Id: I54c0a687c054d49fe047f96e3b72a5c38c776158