Merge "Fix enum comparison to reenable -Wenum-compare" am: 9cf99654 am: 1955d102 am: 7f3d2e04 am: 678e271f

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

Change-Id: I6daee68e7a81923206666b1d17d47bd22ca42c36