[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: 06dc1792 am: 80115c65 am: 248e42b3 -s ours
am skip reason: Change-Id Id4218f9af44c43824a9f530d48bbf8cd88c32a06 with SHA-1 14870e08 is in history
Change-Id: I47b18e91ae3d7c23ee6ab9e8615b5845e7400ca0