Merge "Update aosp atrace.rc to fix throttled_rss_stat on user builds" am:...

Merge "Update aosp atrace.rc to fix throttled_rss_stat on user builds" am: 756d6d9d am: 78339cc3 am: b9091d64 am: 04f29611 am: 9c338ee1

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



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