Merge "Add a Telephony Debug Surface" am: ef4110074e am: 569a38a931
am: 2e1efa4f96

Change-Id: Iaac7fee1fafcdb38a17b6e238fd2436f04af2c9f