Merge "Update the categories of app kill reaons" into rvc-dev am: 7712b3a9 am: 06dc1792 am: 51393d03 Change-Id: Ia92bb7d1a66e6298e0d44bcbead0fc36703fa510