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

Change-Id: I201275ad6daf66201eb57f9215c6ec88fe65539e