Merge "Fix no tunning param case" am: 0c1eecbd am: 7572e71f am: 0e6ca486 am: ad52f2af

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



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