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

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

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