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

Change-Id: I25370bfcc187646220ae4935da98cc017107a2c4