[automerger skipped] Merge "Eliminate memtrack variability in Lost RAM when...

[automerger skipped] Merge "Eliminate memtrack variability in Lost RAM when ION is being used" am: 055977a3 am: fda49eb9 am: 0f1b4367 -s ours

am skip reason: Change-Id Ia7f5fc2ca95389a5f2ae78d4cdbf8ba3ef8e3972 with SHA-1 6162e8bc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30d79478884f25c5c4ebe93364ec51b11c8b0d04