Merge "Add '--no-kill' option to 'adb shell am compat'"