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

Change-Id: I714d5474079b845d46a2cc615fa6d7bac67fa813