[automerger skipped] Merge "Support opening stream with a configuration exactly matching the request." am: 7fd74aab16 am: aedf30072e am: 50666d1fd9 -s ours

am skip reason: Merged-In Iaed1b16a22c7fdb1fbe0bcc566d441fab9e004a2 with SHA-1 735ce4ebe9 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/media/+/2419620

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