[automerger skipped] Merge "Statically link DnsSdTxtRecord into framework-wifi" am: 13b853571f am: 9d348a16d9 am: 72e09722e4 -s ours
am skip reason: Change-Id Ic5f7decfdbc3116a15fe8da3841cc7620105996d with SHA-1 40b3a51ccb is in history

Change-Id: I3e734185856a7eb67b8c5530ac83b67da46dbb70