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

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

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