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

am skip reason: Merged-In I50e6061b99e37561600c0c2524d6be12801e6863 with SHA-1 325ea6bd6f is already in history

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

Change-Id: I39e252ddbb30f4eae55e95d94dd9dedaeb52cd66