Merge "MediaSessionService: Clear calling identity for incoming calls from apps" into oc-dev
am: 2891f34ea9

Change-Id: I44131f5bdc390813567c36b404dccbc0112f3a3a