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

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

Change-Id: I46f1a4135347b743969fb85d1d419deb803957b7