Merge "`am compat reset --no-kill` shouldn't kill the process" into sc-dev am: 2c3254c7 am: 09e8b002

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

Change-Id: I6237d26bb3b00e773d40e02099355e8a09363ced