[automerger skipped] Merge "Update the categories of app kill reaons" into...
[automerger skipped] Merge "Update the categories of app kill reaons" into rvc-dev am: 7712b3a9 am: a7c7a868 -s ours
am skip reason: Change-Id Id4218f9af44c43824a9f530d48bbf8cd88c32a06 with SHA-1 d3aff3ae is in history
Change-Id: I4c7acaec44b5ef14cafc531db795258664dc61ae