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

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

Change-Id: I6a313efe984fcda61d3987ea6ae424c887fc2d6c