Merge tag 'android-security-11.0.0_r49' into int/11/fp3

Android security 11.0.0 release 49

* tag 'android-security-11.0.0_r49':
  dnsmasq: fix heap overflow

Change-Id: Iaea6beec3a123977fd2a3fdc94443a0a2fb6097a