Merge "Fix coroutine tracing imports" into main am: 7a5936d0a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3336257

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