[automerger skipped] Merge "ActivityManagerService: add new lmkd kill reason" into sc-dev am: c0ee8e009b -s ours am: 31391ff8d4 -s ours

am skip reason: Merged-In I5f86197865eb0353ef2c836ec9b2aeaae3bbf2ee with SHA-1 1b55247fbd is already in history

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

Change-Id: Ic398f9eb9175f4a5ac0ba65e186ccde1151d3a62