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':
  Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().

Change-Id: I5bac7eb5e87b2ec516bf190df149cb9e2a7db581