Merge "Update "Play media to" in Sound Settings" into rvc-dev am: 72948ab538
am: 630b918be0
am: 5f06c5e0e7
Change-Id: Idacf9a48764e593b8b61ce1d416f15a238fba7af
This commit is contained in: