[automerger skipped] Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4a am: 06a5b4de am: 2c80f894 -s ours am: 1e307f9a -s ours

am skip reason: Change-Id I631488d95cfd91d5428c877b3a004215031dd223 with SHA-1 9785b9a8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I418965dc9198d24becbbf29acff50a33036b8ffc