Merge "[automerger skipped] Remove FrameRate Enum to allow all possible frame...

Merge "[automerger skipped] Remove FrameRate Enum to allow all possible frame rate values am: 026a007f am: 6ef54743 am: dc0fc846 -s ours am: 36889412 -s ours" into udc-qpr-dev-plus-aosp am: 9508ca75 -s ours

am skip reason: Merged-In I2e2e18a9ec0d1a2fd505464a1297e9b7f9874d1c with SHA-1 026a007f is already in history

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



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