Merge "libmemtrackproxy" am: 1f4918b12b am: 803601b83a am: d5a8c8a43d

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

Change-Id: Ie4b522c1b9e15b155d673398d9ca2a7bccd1f26b