Merge "Play a short/silent WAV file to ensure we get routed media key events"
am: 99b46aabdb

Change-Id: I17b53bba7da5ead62dd8e730dd0ef6db47d3166e