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

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

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