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

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

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

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



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