[automerger skipped] Merge "Update aosp atrace.rc to fix throttled_rss_stat on user builds" am: 756d6d9d am: 78339cc3 am: b9091d64 am: 04f29611 -s ours

am skip reason: skipped by user rsavitski

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



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