[automerger skipped] Added telephony display info support am: 987b8df2 am:...

[automerger skipped] Added telephony display info support am: 987b8df2 am: a397dcf4 -s ours am: 6da20406 -s ours am: 1165e83b -s ours am: d60fe97e -s ours
am skip reason: Change-Id I4dfb6eb7a313539e0565a4239d555426f12e503e with SHA-1 73036c40 is in history

Change-Id: I91de519520c2b67b94877dceeefa4181c0e59ac2