Android 12.0.0 release 18
[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours am: 8028e19c81 -s ours am: 3d5c1fdbb8 -s ours

am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a2bb032939b78528c5e8d50fbb9b0296cc3e800