[automerger skipped] Merge "[Output Switcher] Fix InfoMediaManager route...

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

am skip reason: Merged-In Ic0e7b306ef5ff8a87f90b9fb8a7af9a0e82f1fa0 with SHA-1 ca5ac784 is already in history

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



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