Merge "Update test to ignore enum comparison errors." am: 0f7b9b0ccd am: dd9dd2d185 am: 8eab5f3755 am: 86b9891ad9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/1774965

Change-Id: I467b52a392eee73f354350c896c9cf17c84b1b40