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

* security-aosp-pi-release:
  Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().

Change-Id: I29cb13978eb447c51ff8873a383e5307fba217fd