Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4a am: 06a5b4de

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03ebf873223a08069d9753f7d8ce41423f58ee02