Merge "Revert "Define new ASurfaceTransaction_setFrameRateParams API"" into main