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

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

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