Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b6ebf686a92e6f2dd00691e5d2d4900dd871c99