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

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



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