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

Change-Id: Ia377c5044485bfd436be6246b3ceb5349690ce40