Merge "Remove duplicate help entry in MediaShellCommand" into tm-dev am: 8d4aa6be am: 79d014f7 am: d46df997

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



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