Merge "Add setFrameRateCategory SurfaceControl java API" into main