[automerger skipped] Merge "atrace.rc: fix duplicated block due to...

[automerger skipped] Merge "atrace.rc: fix duplicated block due to automerging" into udc-dev am: c1270f0f am: 3995ab13 -s ours

am skip reason: Merged-In I6001eec487932ab1fd869231815fbf485b7370bb with SHA-1 231446d0 is already in history

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



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