Merge "Add strings for incoming call UX for self-managed calls." am: 3e9c7d2039
am: 2fafee3f4c

Change-Id: I09aa83150f5e7efa101cf55d473e3f59545723cb