[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 am: 325ea6bd6f am: d600a698b2 -s ours am: bcd19cad12 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If01b2a46686b30f879583b650d68cccef190f828