Clean up doh flag am: ca0ecb95 am: cd2fe910 am: 1430105c am: 55c4a69b...

Clean up doh flag am: ca0ecb95 am: cd2fe910 am: 1430105c am: 55c4a69b am: d2435e0c am: 625e0a76

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



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