[automerger skipped] Merge "ActivityManagerService: report current and max thrashing levels" am: 9af29add am: 656efc7a -s ours am: 584bd327 -s ours am: 3b35d60b -s ours

am skip reason: Merged-In I016d95a9b2ba4b6f4ca814be1456cec59f4834da with SHA-1 c8a318e8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776886

Change-Id: I5e559b3dde635ed0b41e1d7711f1a7a0b9a52c37