Merge "Revert "Always send KEYCODE_MEDIA_PLAY_PAUSE""
am: 799c063e24

Change-Id: Ib3b6a74304f7f1df16a96deb0a9b8357d05710f6