Merge "[automerger skipped] Merge "OpusHeader: Fix integer overflow in...

Merge "[automerger skipped] Merge "OpusHeader: Fix integer overflow in GetOpusHeaderBuffers" into qt-qpr1-dev am: 40e79433 -s ours am: 6437df87 -s ours am: ea7f0dab -s ours" into rvc-d1-dev-plus-aosp am: 756b8231 -s ours

am skip reason: Change-Id Iff742d2fdf4139bab7b5f378c1742ef52c0bbc78 with SHA-1 6b3b2f26 is in history

Change-Id: I29916b1e630a3159ba2a9718054a0862be0268a9