[automerger skipped] Merge "Add memtrackproxy system server service" am:...

[automerger skipped] Merge "Add memtrackproxy system server service" am: 6157f7be am: 8cf7b119 am: 7ade67ea -s ours am: 49b74399 -s ours

am skip reason: skip tag Change-Id I10829ffcf4e5b2813d4c622268b0b59da6f171b6 with SHA-1 46d2cc8f is already in history

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

Change-Id: I511575510dd8df2c47fb3ac9da958bc404e9ded5