Merge "[automerger skipped] Merge "Move DnsSdTxtRecord to net common static...

Merge "[automerger skipped] Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d am: 465199b9 -s ours am: 09cf091a -s ours am: 7cd59754 -s ours am skip reason: change_id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA1 3587754f is in history" into rvc-qpr-dev-plus-aosp am: 33c4d5c9 -s ours
am skip reason: Change-Id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA-1 3587754f is in history

Change-Id: Ib0402e905855b6d7ba425381cb503c30f649a14f