Merge the 2021-03-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  backport: dnsmasq: fix heap overflow

Change-Id: I6163a7fd2f4d428145dda037ce32327d0c59f317