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

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

Change-Id: I2b5405fb177f740cb5e1a4cda86ab86220a3c614