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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If10eb20b7dfbe070536afded8ad0e25747a3ed5a