Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  backport: dnsmasq: fix heap overflow
  dnsmasq: fix heap overflow

Change-Id: I38a6a07c7c8c6dcb576838df8b917f815f59260c