Merge "Merge "Fix the ordering of the result of app kill info" into rvc-dev am: da0d734c7d am: 6030f05717" into rvc-qpr-dev am: fc6c76fa85 am: d49a31202f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172785

Change-Id: I4811257a4bda70e86be0c745e6c6130a88c33415