Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f231a

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

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