Merge "MediaSession: clear identity before accessing service methods" into oc-dev
am: 78f5c26fa6

Change-Id: I69e4a7c1a21fae45cbc1d192ca1d3d0a5beb37b0