Merge "let KEYCODE_MEDIA_PLAY_PAUSE answer/hangup calls" into oc-dev am: 3f09fa59e6
am: e136ce3414

Change-Id: I6e4c64d53a5114c2fb44bbfe01665263ee706bab