[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 7df2c06e23 -s ours am: dd859ffd02 -s ours am: 9c1ffcdfe1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I87855fc7dbce87d3d82c0ea32d8881f640190e8f