[automerger skipped] Clean up atrace.rc am: 9bb5291102 am: 80c45447b3 am: 7c52de9b2b -s ours

am skip reason: Merged-In I89e2bc0abe111bed4a230619afa544c214c10e6e with SHA-1 5089908c78 is already in history

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

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