Merge "Fix event parsing" am: 097f8eff8e am: fb09e01f16

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2346823

Change-Id: Iff8ca97ab5bcdf8ecaade258cf83910c539091f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>