[automerger skipped] Merge "Fix media_session shell commands" into tm-dev am:...

[automerger skipped] Merge "Fix media_session shell commands" into tm-dev am: 63104b02 am: b08a6f51 am: f40cb06f -s ours

am skip reason: Merged-In Ie3cee37689ca2be30c522c1439afd5e6dde374e1 with SHA-1 12b2d2c7 is already in history

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



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