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