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

Change-Id: Ia8093b804ec7655fe1f2b19b62bc276a152c8e99