Merge "fix API description on how to round average qp" am: 1c0277d78d am: 8428f9e7cd

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

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