ANDROID: Merge remote-tracking branch 'aosp/upstream-libtraceevent' am: dcb747da11

Original change: https://android-review.googlesource.com/c/platform/external/libtraceevent/+/2084728

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