Merge "Fix: crash when running am.jar without parameters" am: 3bec4772 am:...

Merge "Fix: crash when running am.jar without parameters" am: 3bec4772 am: 23f93b8c am: cfd38b49 am: 2a56521b am: d4e82f15

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

Change-Id: Ifb14a2669d9484012ba409a7b1f096fe11303a9e