Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode"...

Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode" am: 61c2096d am: 996fc3da am: 6e2b382a

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



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