Merge "[Output Switcher] Fix LocalMediaManagerTest" into tm-qpr-dev am: 1d7f570eaa am: b0df01220d

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

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