Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode" am: 61c2096d

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



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