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

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



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