Merge "Support for showing self-managed calls in IncallService."
am: 5a33057092

Change-Id: I3491e4c099abf8ccc504fcb85109ba1576e34aba