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