Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8

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

Change-Id: I50e6061b99e37561600c0c2524d6be12801e6863