[automerger skipped] Merge "atrace: Remove persisitent rss_stat_throttled...

[automerger skipped] Merge "atrace: Remove persisitent rss_stat_throttled trigger" into tm-dev am: 307c410f -s ours

am skip reason: Merged-In I70a978de1fbf2ed538bb869edc715e61aee7efa4 with SHA-1 b065e6f3 is already in history

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



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