Merge "Merge "Add atom for per-process system ion heap size" into qt-dev am:...
Merge "Merge "Add atom for per-process system ion heap size" into qt-dev am: 956197e8 am: 99c185a7" into qt-r1-dev-plus-aosp
am: e11f7857
Change-Id: I7f5533115aad9b33c52cab4cbe752b32643eb12a