[automerger skipped] Merge "DO NOT MERGE: Revert "Media: Add...
[automerger skipped] Merge "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"" into qt-dev am: 88774ef6
am: 86ed242b -s ours
am skip reason: subject contains skip directive
Change-Id: I458c428918c02b0e2087b91749c8e562b8561d8e