[automerger skipped] Merge RQ2A.210305.007 into stage. am: e47d310450 -s ours am: 2f1c53f4ec -s ours am: 39de25cd1c -s ours

am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb12db6802e195409dbe178977e9815c56a5f393