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

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

Change-Id: If12715ef1e5e0f539f4642c59df365062ed23f15