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

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



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