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

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

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



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