Merge tag 'android-10.0.0_r33' into lineage-17.1-android-10.0.0_r33

Android 10.0.0 Release 33 (QQ2A.200405.005)

* tag 'android-10.0.0_r33':
  Revert "audiopolicy: align input and output devices for engine"
  [DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt
  [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.

Change-Id: I6d5446fed03dc4c8a109acb40805e796ba3da00e