Merge "am dumpheap throws error when arguments are after file" into main am:...

Merge "am dumpheap throws error when arguments are after file" into main am: 7e0989d9 am: 19b728ba

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



Change-Id: Ib53be16047db865de39172ca23b7300fd701a129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>