Merge changes from topic "module-rule-tracing" am: ef530fdf am: d3bcae72...

Merge changes from topic "module-rule-tracing" am: ef530fdf am: d3bcae72 am: 9530bfba am: 65e23a90 am: 760ae188

Original change: https://android-review.googlesource.com/c/platform/build/+/2617860



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