Merge "fix API description on how to round average qp" am: 1c0277d7 am:...

Merge "fix API description on how to round average qp" am: 1c0277d7 am: 8428f9e7 am: e766c3d7 am: 0760c5a6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067619



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