ANDROID: Merge remote-tracking branch 'aosp/upstream-libtracefs' am: 9b98f3d5b7 am: c331dc7ff3

Original change: https://android-review.googlesource.com/c/platform/external/libtracefs/+/2084923

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