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

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



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