Merge "[automerger skipped] Remove FrameRate Enum to allow all possible frame rate values am: 026a007fe4 am: 6ef547434b am: dc0fc846ae -s ours am: 368894126b -s ours" into udc-qpr-dev-plus-aosp