Merge "Allow media apps to receive media key events after the phone call" into oc-dev am: 369438a23f
am: 177b739034

Change-Id: Ie544e336c7cb687f7fe9e6102852207dd73b7fb4