[automerger skipped] Merge "Select the highest sampling rate if the requested...

[automerger skipped] Merge "Select the highest sampling rate if the requested is higher than default" into tm-qpr-dev am: aa71142c am: 63257186 -s ours

am skip reason: Merged-In I40391fe3c8f73ff28e519f5b187adb5717e45235 with SHA-1 b12a6da5 is already in history

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



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