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

Change-Id: I7483526db86f0f64b65ad6413dd02966968ffd03