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

Change-Id: Ida616127219a3ec149ebe6c03500c822ad072fbb