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

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

Change-Id: Ifaca98e8230032f5de81363d92961b99793d30ef