Merge "Telephony: Move AdnRecord.aidl into opt/telephony"