[automerger skipped] Merge "Clean up atrace.rc" into main am: 945f3077 am:...

[automerger skipped] Merge "Clean up atrace.rc" into main am: 945f3077 am: c4912c2b -s ours am: 5a3a9315 -s ours am: 2744f0f9 -s ours am: e25e33a4 -s ours

am skip reason: Merged-In I89e2bc0abe111bed4a230619afa544c214c10e6e with SHA-1 9bb52911 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2648648



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