Merge changes from topic "dnssdtxtrecord-jarjar"

* changes:
  Jarjar DnsSdTxtRecord into framework-wifi
  Build framework-telephony-stubs against core_current