Merge "C2SoftAvcEnc: More QP bounding interface work" am: fd4ce6af1b am: 73f82f320e am: 6053f70a22

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

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