Merge "Remove non-existant shell command parameter" into main am: bbc6fc31...

Merge "Remove non-existant shell command parameter" into main am: bbc6fc31 am: c7b8aaff am: 35461a1b

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



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