Merge "CCodecConfig: round frame rate instead of truncating to increase the accuracy" am: ce46680753 am: 75a9e05dad

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2352347

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