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

Change-Id: I27a6d12e13499bf4fd886508c267f5a89cf626b6