Overlay Fix up telephony

Change-Id: I233e61ae0ceb8b2cacdbccf18964dbf4755e0ab8
Merge "Overlay Fix up telephony" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into ose