[automerger skipped] Merge "codec2: Update DmaBufAllocator when new...

[automerger skipped] Merge "codec2: Update DmaBufAllocator when new ComponentStore is set" into sc-v2-dev am: 3fb32360 -s ours am: 5e31e99c -s ours am: 36bd4dd1 -s ours

am skip reason: Merged-In If0ad2128a42ab5db0072de8f6448235fad3e18ee with SHA-1 ac6cb0d9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17005268

Change-Id: I0439f920fac08f5269b48ed235482501dba8db02