Merge "simpleperf: null check FindEventTypeByName return value" am: 3c5ea31c4d am: 48a5d50e46 am: b730fa18bf

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1362437

Change-Id: I9036811da02080d7df0ca401f684b1b8bcf09150