Merge "Fix CTS build in Telephony" into lmp-mr1-dev