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

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

Change-Id: Ib147fb4782a4a554405645fa563e8307d1f305d1