Merge "Revert^2 "[ST02.2] Use the getters of DnsHeader"" am: 3e7778805b am: a5c57f2551

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2217883

Change-Id: Iae31ba8237b9ea7e870d8c3a480789dd99ae6446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>