Merge "Revert "Add new ASurfaceTransaction _setFrameRateParams API"" into main