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

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



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