Merge "[automerger skipped] Merge changes from topic "DNS telemetry" into qt-r1-dev am: 412c59128e -s ours am: e22c237438 -s ours
am: 18da5d7e1e -s ours
am skip reason: change_id Iab542b32a8a18ae0bdbd8e005c430a876f056806 with SHA1 60d4f1a5bd is in history

Change-Id: I925b0fc82a6a84ad6e6cc0970e54d1f011836090