Merge "Add frame rate flexibility token" into rvc-dev am: fcf9aeceb7 am: 45a1f17fce

Exempt-From-Owner-Approval: this is just an Automerger merge
to unstick before b/153296177 is fixed

Change-Id: Ia7dc8bfc2d507f85bb6dc45fb04f5db5cd0774f9