Merge "Add a Telephony Debug Surface"
am: ef4110074e

Change-Id: I0a610d1e2e84411b7657cd0617075f59d06e760f