Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test...

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

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



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