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

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

Change-Id: Idb9495274e7e1cedae8f24db8335c8cbfdc3b97c