[automerger skipped] Merge "Fix total memtrack Graphics and GL calculations"...

[automerger skipped] Merge "Fix total memtrack Graphics and GL calculations" am: d061730d am: 355bd7d9 am: 44c20b34 -s ours am: 074cc33c -s ours

am skip reason: Change-Id I77f06322fbb06ffa33115c1469aba80e59247904 with SHA-1 1c5d7631 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ccdcfa6a604e6e23d4ef1bdee0dfc1e19013c6a