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: 7952ccfc" into rvc-qpr-dev-plus-aosp am: c07af446

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

Change-Id: Ie78a8277a18d62f47cc478a12161e15720770c10