Merge "Allow DAP render-only mix to be matched to mmap-ed stream." into udc-dev am: cabafef8cb am: f4aab24ab4

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

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