Merge changes Ic8705370,I91e18752 into android12-tests-dev

* changes:
  DisplayRefreshRateTest: vote for peak refresh rate
  Revert "Require FrameRateFlexibilityToken while testing refresh rate"