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

Change-Id: Id7c88915bc24b0c21e1e303d0158ba632d5dc9c5