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

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

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