[automerger skipped] Merge "Add ion/ion_stat to the atrace memory category"...
[automerger skipped] Merge "Add ion/ion_stat to the atrace memory category" into rvc-dev am: 925ab74f am: 7705d5e6 -s ours am: 9dc3a666 -s ours
am skip reason: Change-Id I2502d281be0a1de5a0bde41482e70ad8ef29fd0b with SHA-1 88a85f3f is in history
Change-Id: I8d7e29c409cd9476ee782642cb5a7958faad6fb0