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

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

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