Merge "logcat: test: inject() tuning"
am: 26a714a0ab

Change-Id: Ie7f63c15466e8d82cc61da100439466984b89472