Merge "Select the highest sampling rate if the requested is higher than...

Merge "Select the highest sampling rate if the requested is higher than default" into tm-qpr-dev am: aa71142c

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



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