[automerger skipped] Merge "Fix Lost RAM calculation by accounting for ION mapped heaps" am: 16d1603b81 am: 6a611280ed -s ours am: 956d887141 -s ours

am skip reason: Change-Id I2bad40bbe7d14b1c61534d661b612200ef1084e4 with SHA-1 b55e856e59 is in history

Change-Id: I44a39f17539369951742134f0465c52e6a94b87e