Merge changes from topics "ddr-tests-in-networkstack", "move-fakedns" into main am: 64892a9697 am: e4ffd1632c

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

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