Merge "Backfill atom tests for new event metric format" am: 9706e6072f am: 291820727f

Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/1922001

Change-Id: If86ad1c9cefcd16a97f4e0109d15024859f95bd5