[automerger skipped] Merge "Fix no tunning param case" into tm-dev am:...

[automerger skipped] Merge "Fix no tunning param case" into tm-dev am: 19f7688d -s ours am: 548851f3 -s ours am: 4de8ec39 -s ours

am skip reason: Merged-In Ib0ab1f2996be57e2adbbabf04a8b4cd091abf57a with SHA-1 560fa767 is already in history

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



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