Merge "[Output Switcher] Fix InfoMediaManager route listing preference...

Merge "[Output Switcher] Fix InfoMediaManager route listing preference updates" into udc-dev am: f94a59c2 am: fda35020

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



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