Merge "Fix configuring of unrecognized level values" am: 255a951e am:...

Merge "Fix configuring of unrecognized level values" am: 255a951e am: c721a5e4 am: d6dc63d4 am: f1ab717d am: 0a0ab609

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



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