[automerger skipped] Merge "Do not propagate WIU/BFSL for...

[automerger skipped] Merge "Do not propagate WIU/BFSL for MediaController.sendCommand" into tm-dev am: ddce211c am: b833c453 am: a5fd61f6 am: a1a8327e am: f3c10457 am: 895cd387 -s ours

am skip reason: Merged-In I548a8178a93d9bf0691aa84113147ac86c1ef0a2 with SHA-1 ef878077 is already in history

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



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