Merge "Always send KEYCODE_MEDIA_PLAY_PAUSE"
am: 3249810e04

Change-Id: Iab55cc8407456e792b0c236850c538cbc0ea111a