Merge "C2SoftVpxEnc: add support for levels upto 4.1" am: 985ef526be am: 972057ec1e

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

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