Merge "Fix build with logging_trace_provider" into main am: b258d2ee60

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

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