[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output...

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test cases in MediaDeviceTest" into tm-dev am: 27561c31 am: 3b1363ff am: 068f669a -s ours

am skip reason: subject contains skip directive

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



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