[automerger skipped] Merge "Add trace redactor to system" into main am:...

[automerger skipped] Merge "Add trace redactor to system" into main am: 25efbf1c am: 03dfc095 -s ours

am skip reason: Merged-In I661fca73c02e2904b988b4bddce62f09c7e3a5d7 with SHA-1 9d92aacb is already in history

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



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