DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1

Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139

Change-Id: I570cac0bb61398920c453b99cf03584a7b04c291