Merge "Eliminate memtrack variability in Lost RAM when ION is being used" am: 055977a3c9 am: fda49eb9a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b8c6bf00639dfe066d99b8334c2328aa4e2f141