Merge "logcat: test: tail_# occasional failures" am: e7b335b471
am: a1f43ebf89

Change-Id: I9da3e1580387ec4636a65540ffe415c3537ff1ff