Merge "Merge "Use killUid() instead of killApplication()." into rvc-dev am:...

Merge "Merge "Use killUid() instead of killApplication()." into rvc-dev am: 804ac87b am: f0df75e3 am: 049aa3d7" into rvc-qpr-dev-plus-aosp am: cfe7a5dc

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

Change-Id: Ie93114a0890cf86b0c39d1aba96e662e8a14013c