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

Change-Id: I229ddcbc289cfb5b88d1fe2c4524c568fab4fdf4