Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into...

Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a228 am: 341487c3

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



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