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

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



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