Inject a message for event_tag_filter and bucket tests. The former
registered an occasional failure.
Switch order of EXPECT checks so that constant is on the right so
that error reports make more sense.
Test: gTest logcat-unit-tests --gtest_filter=*.event_tag_filter
Test: gTest logcat-unit-tests
Bug: 37791296
Change-Id: Ic2536e6e4c95e3a913ad0ea4c22219aa3c5c01eb