[automerger skipped] Merge "Allow DAP render-only mix to be matched to mmap-ed stream." into udc-dev am: cabafef8cb am: 145b5d6d32 -s ours

am skip reason: Merged-In If1e0ffb980e989cfd0fb9c6d2f87fac60ad7d067 with SHA-1 35d6422e65 is already in history

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

Change-Id: I1e08f0794dd7e2530073f67552b3f4d73122c11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>