Merge "[Output Switcher] Refactor MediaOutputAdapter" into tm-qpr-dev am: 7b431244 am: ab85f899

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



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