Merge tag 'android-security-10.0.0_r61' into staging/lineage-17.1_merge-android-security-10.0.0_r61

Android security 10.0.0 release 61

* tag 'android-security-10.0.0_r61':
  C2SoftMp3Dec: fix OOB write in output buffer
  Fix heap-buffer-overflow in MPEG4Extractor am: d13a4efc

Change-Id: Id4e83d23fa751da4a40fbde8a3029a7c406452aa