Merge "Fix: crash when running am.jar without parameters" am: 3bec47724f am: 23f93b8cf3 am: cfd38b49d4 am: 2a56521b5c am: d4e82f152d

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

Change-Id: Ifb14a2669d9484012ba409a7b1f096fe11303a9e