Merge "C2SoftVpxEnc: add support for levels upto 4.1" am: 985ef526 am:...

Merge "C2SoftVpxEnc: add support for levels upto 4.1" am: 985ef526 am: 972057ec am: 3bf3a9b8 am: e6c84570 am: 03eccdec

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



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