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

Change-Id: I4b6c0f145fa83b4c1bb895256b4de45598e5f363