Merge "Revert "Add new ANativeWindow_setFrameRateParams API"" into main