[automerger skipped] C2SoftVpxEnc: add support for levels upto 4.1 am:...

[automerger skipped] C2SoftVpxEnc: add support for levels upto 4.1 am: a08e5b79 -s ours am: 0e031dd1 -s ours

am skip reason: Merged-In Ie0edc2276ce123cfbcba3bf02b1aaedf5d630370 with SHA-1 df62e0f3 is already in history

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



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