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

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

Change-Id: Iee42eed99f753c3252b82d8b5b1f3b77c34f67dc