Merge "atrace.rc: fix duplicated block due to automerging" into udc-dev am: c1270f0f

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



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