[automerger skipped] Merge "Allow DAP render-only mix to be matched to mmap-ed...

[automerger skipped] Merge "Allow DAP render-only mix to be matched to mmap-ed stream." into udc-dev am: cabafef8 am: 145b5d6d -s ours am: 29243952 -s ours am: 5b983d6b -s ours

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

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



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