Merge "logcat: test: inject for *.event_tag_filter" am: 2841b4efe0 am: ed1e53fc77
am: 9a2b70a7c8

Change-Id: I26c223bfe6a8028130427d73079fe5306cf65253