[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 -s ours am: 27570e00 -s ours
am skip reason: Change-Id I2502d281be0a1de5a0bde41482e70ad8ef29fd0b with SHA-1 39e7d271 is in history
Change-Id: I7a330246c7815e186e41453283d4dc23be2f357b