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

Change-Id: I1959e75f38d271c50bc5efdc6aa62e52db9a0b9f