[automerger skipped] Merge "tracinglib: remove -Xmulti-platform" into main am: 36585c98 am: c6c8d945 -s ours

am skip reason: Merged-In Ifff786f94765fec844b64716d3f961c9b49d16b9 with SHA-1 546089ae is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/3326155



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