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

Change-Id: Icf290d54c055f9f5d4940c36dfabc524f59d24ba